|
|
@@ -103,7 +103,7 @@ module SortableEvents
|
103
|
103
|
EXPRESSION_TYPES = EXPRESSION_PARSER.keys.freeze
|
104
|
104
|
|
105
|
105
|
def validate_events_order
|
106
|
|
- case order_by = events_order()
|
|
106
|
+ case order_by = events_order
|
107
|
107
|
when nil
|
108
|
108
|
when Array
|
109
|
109
|
# Each tuple may be either [expression, type, desc] or just
|
|
|
@@ -135,7 +135,9 @@ module SortableEvents
|
135
|
135
|
|
136
|
136
|
# Sort given events in order specified by the "events_order" option
|
137
|
137
|
def sort_events(events)
|
138
|
|
- order_by = events_order().presence or return events
|
|
138
|
+ order_by = events_order.presence or
|
|
139
|
+ return events
|
|
140
|
+
|
139
|
141
|
orders = order_by.map { |_, _, desc = false| boolify(desc) }
|
140
|
142
|
|
141
|
143
|
Utils.sort_tuples!(
|